Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hermitkernel-target: Set OS to "none" #90404

Merged
merged 1 commit into from
Oct 31, 2021

Conversation

mkroening
Copy link
Contributor

For our kernel targets, we should not set OS, as the kernel runs bare
metal without a circular dependency on std.

This also prepares us for unifying with
#89062. This patch requires
libhermit-rs to change a cfgs from target_os = "hermit" to target_os = "none".

I tested this patch locally.

CC: @stlankes

For our kernel targets, we should not set OS, as the kernel runs bare
metal without a circular dependency on std.

This also prepares us for unifying with
rust-lang#89062. This patch requires
libhermit-rs to change a `cfg`s from `target_os = "hermit"` to `target_os
= "none"`.

I tested this patch locally.
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 29, 2021
@joshtriplett
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 30, 2021

📌 Commit 311a249 has been approved by joshtriplett

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 30, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 30, 2021
…askrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#89789 (Add #[must_use] to thread::Builder)
 - rust-lang#89899 (Add #[must_use] to remaining alloc functions)
 - rust-lang#90401 (hermit: Implement Condvar::wait_timeout)
 - rust-lang#90404 (hermitkernel-target: Set OS to "none")

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ce48803 into rust-lang:master Oct 31, 2021
@rustbot rustbot added this to the 1.58.0 milestone Oct 31, 2021
@mkroening mkroening deleted the hermit-kernel-no-os branch October 31, 2021 07:27
mkroening added a commit to mkroening/libhermit-rs that referenced this pull request Dec 1, 2021
The kernel's target os was removed in rust-lang/rust#90404
Remove __rg_oom since the filter for `target_os = "hermit"` does not
work anymore: rust-lang/rust@bc6b2ac
mkroening added a commit to mkroening/libhermit-rs that referenced this pull request Dec 1, 2021
The kernel's target os was removed in rust-lang/rust#90404
Remove __rg_oom since the filter for `target_os = "hermit"` does not
work anymore: rust-lang/rust@bc6b2ac
mkroening added a commit to mkroening/libhermit-rs that referenced this pull request Dec 1, 2021
The kernel's target os was removed in rust-lang/rust#90404.
It is only used for x86_64 and not for aarch64.
Remove __rg_oom since the filter for `target_os = "hermit"` does not
work anymore: rust-lang/rust@bc6b2ac
mkroening added a commit to mkroening/libhermit-rs that referenced this pull request Dec 1, 2021
The kernel's target os was removed in rust-lang/rust#90404.
It is only used for x86_64 and not for aarch64.
Remove __rg_oom since the filter for `target_os = "hermit"` does not
work anymore: rust-lang/rust@bc6b2ac
mkroening added a commit to mkroening/libhermit-rs that referenced this pull request Dec 1, 2021
The kernel's target os was removed in rust-lang/rust#90404.
It is only used for x86_64 and not for aarch64.
Adjust filter on __rg_oom since the filter for `target_os = "hermit"` does not
work anymore for the kernel target: rust-lang/rust@bc6b2ac
mkroening added a commit to mkroening/libhermit-rs that referenced this pull request Dec 4, 2021
The kernel's target os was removed in rust-lang/rust#90404.
It is only used for x86_64 and not for aarch64.
Adjust filter on __rg_oom since the filter for `target_os = "hermit"` does not
work anymore for the kernel target: rust-lang/rust@bc6b2ac
mkroening added a commit to mkroening/libhermit-rs that referenced this pull request Dec 4, 2021
The kernel's target os was removed in rust-lang/rust#90404.
It is only used for x86_64 and not for aarch64.
Adjust filter on __rg_oom since the filter for `target_os = "hermit"` does not
work anymore for the kernel target: rust-lang/rust@bc6b2ac
mkroening added a commit to mkroening/libhermit-rs that referenced this pull request Dec 5, 2021
The kernel's target os was removed in rust-lang/rust#90404.
It is only used for x86_64 and not for aarch64.
Adjust filter on __rg_oom since the filter for `target_os = "hermit"` does not
work anymore for the kernel target: rust-lang/rust@bc6b2ac
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants